Update path rewriting code for cmake and pkgconfig files

diff --git a/debian/set-paths b/debian/set-paths
index 231332d3892d03bb630aff47d902d3a5c11cfa3c..c0a947a03ebe37c719a9b091474083b30e693883 100755 (executable)
--- a/debian/set-paths
+++ b/debian/set-paths
@@ -1,42 +1,57 @@
 #!/bin/sh
 
-# Replace build directory value by install directory value
+# This script is to:
+# - remove build paths from the config
+# - set file paths pointing to the FHS locations in the packages
+
 package="libshiboken6-dev"
-for directory in "cmake/Shiboken6" "pkgconfig"; do
-        sed -i "s|build.*relwithdebinfo/lib|usr/lib/$DEB_HOST_MULTIARCH|" \
-           debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
-        sed -i "s|build.*relwithdebinfo|usr|" \
-           debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
-        sed -i "s|\${PACKAGE_PREFIX_DIR}|/usr|" \
-           debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
-        sed -i "s|\${_IMPORT_PREFIX}/lib|\${_IMPORT_PREFIX}/$DEB_HOST_MULTIARCH|" \
-           debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
-        sed -i "s|\${_IMPORT_PREFIX}/include|\${_IMPORT_PREFIX}/../include|" \
-           debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
-#         sed -i "s|libshiboken6.*\.so|libshiboken6\${PYTHON_CONFIG_SUFFIX}.so|" \
-#          debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/Shiboken6Targets-*.cmake;
+
+# Fix up cmake variables
+for directory in "cmake/Shiboken6"; do
+    sed -i "
+        s|\"\${PACKAGE_PREFIX_DIR}/lib\"|/usr/lib/$DEB_HOST_MULTIARCH|;
+        s|\${PACKAGE_PREFIX_DIR}|/usr|;
+        s|\${_IMPORT_PREFIX}/lib|\${_IMPORT_PREFIX}/$DEB_HOST_MULTIARCH|;
+        s|\${_IMPORT_PREFIX}/include|\${_IMPORT_PREFIX}/../include|;
+        s|\${_IMPORT_PREFIX}/bin|\${_IMPORT_PREFIX}/../bin|;
+        s|^set_and_check(PYSIDE_PYTHONPATH.*|set_and_check(PYSIDE_PYTHONPATH \"/usr/lib/python3/dist-packages/PySide6\")|;
+    " \
+    debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*
 done
 
+# Fix up pkgconfig files
+sed -i "
+    s|prefix=.*|prefix=/usr| ;
+    s|exec_prefix=.*|exec_prefix=\${prefix}| ;
+    s|libdir=.*|libdir=\${exec_prefix}/lib/$DEB_HOST_MULTIARCH|;
+    s|includedir=.*|includedir=\${exec_prefix}/include/shiboken6|;
+    " \
+    debian/libshiboken6-dev/usr/lib/*/pkgconfig/shiboken6.pc
+
+# Fix up python __init__.py
+sed -i "s|in_build = Path.*|in_build = False|" debian/libpyside6-py3-*/usr/lib/python3/dist-packages/PySide6/__init__.py
+
+
 package="libpyside6-dev"
-for directory in "pkgconfig" "cmake/PySide6"; do
-        sed -i "s|build.*relwithdebinfo/lib|usr/lib/$DEB_HOST_MULTIARCH|" \
-           debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
-        sed -i "s|build.*relwithdebinfo|usr|" \
-           debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
-        sed -i "s|\${PACKAGE_PREFIX_DIR}|/usr|" \
-           debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
-        sed -i "s|\${_IMPORT_PREFIX}/lib|\${_IMPORT_PREFIX}/$DEB_HOST_MULTIARCH|" \
-           debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
-        sed -i "s|\${_IMPORT_PREFIX}/include|\${_IMPORT_PREFIX}/../include|" \
-           debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
-#         sed -i "s|libpyside6.*\.so|libpyside6\${PYTHON_CONFIG_SUFFIX}.so|" \
-#          debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/PySide6Targets-*.cmake;
-done
 
-# Set correctly the python path for pyside6 (Python3)
-sed -i "s|^set_and_check(PYSIDE_PYTHONPATH.*|set_and_check(PYSIDE_PYTHONPATH \"/usr/lib/python3/dist-packages/PySide6\")|" \
-    debian/libpyside6-dev/usr/lib/$DEB_HOST_MULTIARCH/cmake/PySide6/PySide6Config.*.cmake
+# Fix up cmake variables
+for directory in "cmake/PySide6" "cmake/PySide6Qml"; do
+    sed -i "
+        s|\${PACKAGE_PREFIX_DIR}|/usr|;
+        s|\${_IMPORT_PREFIX}/lib|\${_IMPORT_PREFIX}/$DEB_HOST_MULTIARCH|;
+        s|^set_and_check(PYSIDE_PYTHONPATH.*|set_and_check(PYSIDE_PYTHONPATH \"/usr/lib/python3/dist-packages/PySide6\")|;
+    " \
+    debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*
+done
 
-# Set correctly the python path for shiboken6 (Python3)
-sed -i "s|^set_and_check(SHIBOKEN_PYTHON_MODULE_DIR.*|set_and_check(SHIBOKEN_PYTHON_MODULE_DIR \"/usr/lib/python3/dist-packages/shiboken6\")|" \
-    debian/libshiboken6-dev/usr/lib/$DEB_HOST_MULTIARCH/cmake/Shiboken6/Shiboken6Config.cmake
+# Fix up pkgconfig files
+sed -i "
+    s|prefix=.*|prefix=/usr| ;
+    s|exec_prefix=.*|exec_prefix=\${prefix}| ;
+    s|libdir=.*|libdir=\${exec_prefix}/lib/$DEB_HOST_MULTIARCH|;
+    s|includedir=.*|includedir=\${exec_prefix}/include/PySide6|;
+    s|typesystemdir=.*|typesystemdir=\${exec_prefix}/share/PySide6/typesystems|;
+    s|gluedir=.*|gluedir=\${exec_prefix}/share/PySide6/glue|;
+    s|pythonpath=.*|pythonpath=\${exec_prefix}/lib/python3/dist-packages|;
+    " \
+    debian/libpyside6-dev/usr/lib/*/pkgconfig/pyside6.pc